Handle Control-digits specially.

	* gdk/win32/gdkevents.c (gdk_event_translate): Handle
 	Control-digits specially.

diff --git a/ChangeLog b/ChangeLog
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e67d24854bbf96ded57098b36f56e66e4800a6c5..5eff882753bbe7ad5bada92f6c1894f3cc132c7b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,13 @@
+1999-07-04  Tor Lillqvist  <tml@iki.fi>
+
+       * gdk/win32/gdkevents.c (gdk_event_translate): Handle
+       Control-digits specially.
+
 1999-07-03  Tor Lillqvist  <tml@iki.fi>
 
        * gtk/makefile.{cygwin,msc}: New pthreads version. Use gettext.
 
-Mon Jun 28 10:03:07 1999  Tor Lillqvist  <tml@iki.fi>
+1999-06-28  Tor Lillqvist  <tml@iki.fi>
 
        * gdk/win32/gdkimage.c (gdk_image_get): bpl was set wrong for
        bitmaps, should be multiple of 4. (Thanks to Hans Breuer for

diff --git a/gdk/win32/gdkevents-win32.c b/gdk/win32/gdkevents-win32.c
index e01740f132069ce7c6eea0fc808f018d86c22e8f..e197e006ee70b72b338482250419f3d3bde19a9a 100644 (file)
--- a/gdk/win32/gdkevents-win32.c
+++ b/gdk/win32/gdkevents-win32.c
@@ -1528,6 +1528,25 @@ gdk_event_translate (GdkEvent *event,
          event->key.keyval = GDK_F15; break;
        case VK_F16:
          event->key.keyval = GDK_F16; break;
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+         if (GetKeyState (VK_CONTROL) < 0)
+           /* Control-digits won't come in as a WM_CHAR */
+           event->key.keyval = GDK_0 + (xevent->wParam - '0');
+         else
+           {
+             ignore_WM_CHAR = FALSE;
+             event->key.keyval = GDK_VoidSymbol;
+           }
+         break;
        default:
          if (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP)
            {

diff --git a/gdk/win32/gdkevents.c b/gdk/win32/gdkevents.c
index e01740f132069ce7c6eea0fc808f018d86c22e8f..e197e006ee70b72b338482250419f3d3bde19a9a 100644 (file)
--- a/gdk/win32/gdkevents.c
+++ b/gdk/win32/gdkevents.c
@@ -1528,6 +1528,25 @@ gdk_event_translate (GdkEvent *event,
          event->key.keyval = GDK_F15; break;
        case VK_F16:
          event->key.keyval = GDK_F16; break;
+       case '0':
+       case '1':
+       case '2':
+       case '3':
+       case '4':
+       case '5':
+       case '6':
+       case '7':
+       case '8':
+       case '9':
+         if (GetKeyState (VK_CONTROL) < 0)
+           /* Control-digits won't come in as a WM_CHAR */
+           event->key.keyval = GDK_0 + (xevent->wParam - '0');
+         else
+           {
+             ignore_WM_CHAR = FALSE;
+             event->key.keyval = GDK_VoidSymbol;
+           }
+         break;
        default:
          if (xevent->message == WM_SYSKEYDOWN || xevent->message == WM_SYSKEYUP)
            {